x11: Don't include gdkprivate.h in gdkx.h

It's private, mkay?
And include it directly where we need it anyway.

diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index bf1f0977fc49139bb9cb4284be4a53eba6534ec7..5db972c7f23757a2599f94dbd1362f0e2bad7892 100644 (file)
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -27,7 +27,8 @@
 #ifndef __GDK_X_H__
 #define __GDK_X_H__
 
-#include <gdk/gdkprivate.h>
+#include <gdk/gdk.h>
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 

diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c
index c5f2824f88d314a11492e4ae086bd136af29c3c7..963d832b856413e8dd44fa60f13cdd8527e257cb 100644 (file)
--- a/gtk/gtksocket-x11.c
+++ b/gtk/gtksocket-x11.c
@@ -39,7 +39,8 @@
 #include "gtkdnd.h"
 #include "gtkdebug.h"
 
-#include "x11/gdkx.h"
+#include "gdk/x11/gdkx.h"
+#include "gdk/gdkprivate.h"
 
 #ifdef HAVE_XFIXES
 #include <X11/extensions/Xfixes.h>